Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream v2.60.2 #197

Merged
merged 19 commits into from
Jun 29, 2024
Merged

Upstream v2.60.2 #197

merged 19 commits into from
Jun 29, 2024

Conversation

mininny
Copy link
Member

@mininny mininny commented Jun 26, 2024

mriccobene and others added 19 commits June 5, 2024 15:49
This is a fix for: 

erigontech#10192

This fixes is a deadlock in v4_udp.go where 
* Thread A waits on mutex.Lock() in resetTimeout() called after reading
listUpdate channel.
* Thread B waits on listUpdate <- plist.PushBack(p) called after locking
mutex.Lock()
  
This fix decouples the list operations which need locking from the
channel operations which don't by storing the changes in local
variables. These updates are used for resetting a timeout - which is not
order dependent.
…ion workflows (erigontech#10778)

This PR backports improvements that we added to the E3 tests: recording
runner name and db version used for testing on MongoDB database.
Merged all the work done from main branch to keep diagnostics up to
date.
Cherry pick PR erigontech#10093 into the release branch

Co-authored-by: Minhyuk Kim <kimminhyuk1004@gmail.com>
Cherry pick PR erigontech#10825 into the release branch

Co-authored-by: Minhyuk Kim <kimminhyuk1004@gmail.com>
@mininny mininny requested review from pcw109550 and ImTei June 26, 2024 16:58
@mininny mininny merged commit d32496c into op-erigon Jun 29, 2024
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants